Skip to content

add X11 to PLATFORM_LIBARIES when found#1166

Merged
cgutman merged 1 commit intoLizardByte:nightlyfrom
devusb:x11-include
Apr 12, 2023
Merged

add X11 to PLATFORM_LIBARIES when found#1166
cgutman merged 1 commit intoLizardByte:nightlyfrom
devusb:x11-include

Conversation

@devusb
Copy link
Contributor

@devusb devusb commented Apr 10, 2023

Description

Prior to #997 it appears that full X11 libraries were only needed as part of FFMPEG_PLATFORM_LIBRARIES -- however, after this change, they are also needed outside the context of FFmpeg. This PR adds them to PLATFORM_LIBRARIES when found to satisfy this requirement.

Believe this is not an issue currently because the requirement is handled by FFMPEG_PLATFORM_LIBRARIES -- however it manifests as part of the nixpkgs packaging of Sunshine as we use FFmpeg from nixpkgs rather than the prebuilt version.

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

@CLAassistant
Copy link

CLAassistant commented Apr 10, 2023

CLA assistant check
All committers have signed the CLA.

@github-actions
Copy link

Your PR was set to master, PRs should be sent to nightly.
The base branch of this PR has been automatically changed to nightly.
Please check that there are no merge conflicts

@github-actions github-actions bot changed the base branch from master to nightly April 10, 2023 16:57
@devusb devusb force-pushed the x11-include branch 2 times, most recently from 9ced7fd to a067da6 Compare April 10, 2023 17:05
@cgutman cgutman merged commit 010440d into LizardByte:nightly Apr 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants